From: Sebastian Keller <skeller@gnome.org>
Date: Thu, 30 Apr 2026 01:44:57 +0000 (+0200)
Subject: keyboardManager: Use layout id when reapplying
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~10^2^2~15
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b154abd6608ecd64916fdfeea70eb72e1f9686df;p=gnome-shell.git

keyboardManager: Use layout id when reapplying

`_doApply()` expects the id rather than the layout info itself. Passing
the layout info caused the lookup to fail and the function to exit
early. This was preventing `xkb-option` or `xkb-model` settings from
applying when changed.

Fixes: 0f9034687 ("status/keyboard: Adapt to external source of keyboard layout")
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/work_items/9197
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4205>
---

diff --git a/js/misc/keyboardManager.js b/js/misc/keyboardManager.js
index 5724156e1..a0cea79b1 100644
--- a/js/misc/keyboardManager.js
+++ b/js/misc/keyboardManager.js
@@ -130,7 +130,7 @@ class KeyboardManager extends Signals.EventEmitter {
         if (!this._current)
             return;
 
-        this._doApply(this._current).catch(logError);
+        this._doApply(this._current.id).catch(logError);
     }
 
     setUserLayouts(ids) {